Stop scrolling when the pathbar goes away. (#167094, Rodney Dawes)

2005-02-11  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkpathbar.c (gtk_path_bar_finalize): Stop scrolling
	when the pathbar goes away.  (#167094, Rodney Dawes)
	(change_icon_theme): Use GTK_ICON_SIZE_MENU here as
	well  (Vincent Noel)

diff --git a/ChangeLog b/ChangeLog
index 7b15ca3783216198bb28c79c69af88c27d554f08..09702bb9cc4f961e5ece0094a10755df3c35e7d6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-02-11  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkpathbar.c (gtk_path_bar_finalize): Stop scrolling 
+       when the pathbar goes away.  (#167094, Rodney Dawes)
+       (change_icon_theme): Use GTK_ICON_SIZE_MENU here as 
+       well  (Vincent Noel)
+
 2005-02-11  Matthias Clasen  <mclasen@redhat.com>
 
        Support vertical menubars  (#166632): 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 7b15ca3783216198bb28c79c69af88c27d554f08..09702bb9cc4f961e5ece0094a10755df3c35e7d6 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,10 @@
+2005-02-11  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkpathbar.c (gtk_path_bar_finalize): Stop scrolling 
+       when the pathbar goes away.  (#167094, Rodney Dawes)
+       (change_icon_theme): Use GTK_ICON_SIZE_MENU here as 
+       well  (Vincent Noel)
+
 2005-02-11  Matthias Clasen  <mclasen@redhat.com>
 
        Support vertical menubars  (#166632): 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 7b15ca3783216198bb28c79c69af88c27d554f08..09702bb9cc4f961e5ece0094a10755df3c35e7d6 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,10 @@
+2005-02-11  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkpathbar.c (gtk_path_bar_finalize): Stop scrolling 
+       when the pathbar goes away.  (#167094, Rodney Dawes)
+       (change_icon_theme): Use GTK_ICON_SIZE_MENU here as 
+       well  (Vincent Noel)
+
 2005-02-11  Matthias Clasen  <mclasen@redhat.com>
 
        Support vertical menubars  (#166632): 

diff --git a/gtk/gtkpathbar.c b/gtk/gtkpathbar.c
index 4de2da197bc16ffdeffb623bd3d500ba2771daf1..737cfc3f3b5219181b9913aa2d1269e5e8900454 100644 (file)
--- a/gtk/gtkpathbar.c
+++ b/gtk/gtkpathbar.c
@@ -54,7 +54,7 @@ typedef enum {
 static guint path_bar_signals [LAST_SIGNAL] = { 0 };
 
 /* Icon size for if we can't get it from the theme */
-#define FALLBACK_ICON_SIZE 20
+#define FALLBACK_ICON_SIZE 16
 
 typedef struct _ButtonData ButtonData;
 
@@ -92,6 +92,7 @@ static void gtk_path_bar_scroll_up                (GtkWidget        *button,
                                                   GtkPathBar       *path_bar);
 static void gtk_path_bar_scroll_down              (GtkWidget        *button,
                                                   GtkPathBar       *path_bar);
+static void gtk_path_bar_stop_scrolling           (GtkPathBar       *path_bar);
 static gboolean gtk_path_bar_slider_button_press  (GtkWidget        *widget,
                                                   GdkEventButton   *event,
                                                   GtkPathBar       *path_bar);
@@ -197,6 +198,9 @@ gtk_path_bar_finalize (GObject *object)
   GtkPathBar *path_bar;
 
   path_bar = GTK_PATH_BAR (object);
+
+  gtk_path_bar_stop_scrolling (path_bar);
+
   g_list_free (path_bar->button_list);
   if (path_bar->root_path)
     gtk_file_path_free (path_bar->root_path);
@@ -835,7 +839,7 @@ change_icon_theme (GtkPathBar *path_bar)
 
   settings = gtk_settings_get_for_screen (gtk_widget_get_screen (GTK_WIDGET (path_bar)));
 
-  if (gtk_icon_size_lookup_for_settings (settings, GTK_ICON_SIZE_BUTTON, &width, &height))
+  if (gtk_icon_size_lookup_for_settings (settings, GTK_ICON_SIZE_MENU, &width, &height))
     path_bar->icon_size = MAX (width, height);
   else
     path_bar->icon_size = FALLBACK_ICON_SIZE;